Skip to content

Sync with reactjs.org @ 63332462#224

Merged
vldmrkl merged 25 commits intomasterfrom
sync-63332462
Aug 3, 2020
Merged

Sync with reactjs.org @ 63332462#224
vldmrkl merged 25 commits intomasterfrom
sync-63332462

Conversation

@reactjs-translation-bot
Copy link
Copy Markdown
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Jul 27, 2020

This PR was automatically generated.

Merge changes from reactjs.org at 6333246

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

coryhouse and others added 24 commits June 16, 2020 11:59
Removed reference to it being experimental. Changed link to MDN. Mentioned version where it was added.
…"Next article" links => Issue Resolved (#3082)
Added and updated copyright headers.

Added some missing Flow types.

Removed an invalid prop-types import.
* Added padding to the left and to the right

* Switched it to MetaTitle
Co-authored-by: Nikhil Sharma <nikhilsharma@Nikhils-MacBook-Pro.local>
* Correct grammar in conditional-rendering.md

* Correct grammar in content/docs/conditional-rendering.md
* Update urls of tools examples

Some urls are outdated, they still redirect to the correct page but for example the info you can see on the bottom left of the page to know which page you're about to visit when hovering the link is wrong.

- https://github.com/facebookincubator/create-react-app -> https://github.com/facebook/create-react-app
- https://github.com/zeit/next.js/ -> https://github.com/vercel/next.js

* Provide urls to tools websites instead of GH repos
…3136)

* Removed deadlink from Event System section and added correct links

* Changed wording of Event System section and removed react-native events link

* Update codebase-overview.md

Co-authored-by: Dowen Robinson <drobinson@ad.accelclaims.com>
Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
* Update hooks-overview.md

Changed 'is' -> 'are'

* Update content/docs/hooks-overview.md

Co-authored-by: Ricky <rickhanlonii@gmail.com>

Co-authored-by: Ricky <rickhanlonii@gmail.com>
@netlify
Copy link
Copy Markdown

netlify Bot commented Jul 27, 2020

Deploy preview for uk-reactjs ready!

Built with commit 31c644e

https://deploy-preview-224--uk-reactjs.netlify.app

@vldmrkl vldmrkl merged commit a64f7d6 into master Aug 3, 2020
@alinkedd alinkedd deleted the sync-63332462 branch May 6, 2024 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.